Merge pull request #15753 from Zlash65/fix-mod
[Minor] Field name fix to fetch Supplier
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 699dcf3..24c5bc2 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.61'
+__version__ = '10.1.62'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 74ca258..937911f 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -339,19 +339,20 @@
additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)
+ accounts = frappe.db.sql_list("""select name from `tabAccount`
+ where lft >= %s and rgt <= %s""", (root_lft, root_rgt))
+ additional_conditions += " and account in ('{}')"\
+ .format("', '".join([frappe.db.escape(d) for d in accounts]))
+
gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year, debit_in_account_currency, credit_in_account_currency, account_currency from `tabGL Entry`
where company=%(company)s
{additional_conditions}
and posting_date <= %(to_date)s
- and account in (select name from `tabAccount`
- where lft >= %(lft)s and rgt <= %(rgt)s)
order by account, posting_date""".format(additional_conditions=additional_conditions),
{
"company": company,
"from_date": from_date,
"to_date": to_date,
- "lft": root_lft,
- "rgt": root_rgt,
"cost_center": filters.cost_center,
"project": filters.project
},
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 09973d9..8c3dafe 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_events_in_timeline": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
@@ -397,7 +398,7 @@
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 1,
+ "read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -1613,7 +1614,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-08-29 06:29:51.682813",
+ "modified": "2018-10-19 12:38:34.448513",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
@@ -1684,7 +1685,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0,
"track_views": 0
}
\ No newline at end of file