Merge branch 'hotfix'

bumped to version 10.1.69
fix: Return default if company not found (#15915 )
2026-07-21 03:42:28 +00:00 · 2018-11-07 11:26:10 +00:00 · 2018-11-07 11:26:10 +00:00 · 2018-11-06 17:24:45 +05:30
2 changed files with 2 additions and 2 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate

-__version__ = '10.1.68'
+__version__ = '10.1.69'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -16,7 +16,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
 	if not filters: filters = {}
 	columns = get_columns(additional_table_columns)

-	company_currency = erpnext.get_company_currency(filters.company)
+	company_currency = erpnext.get_company_currency(filters.get('company'))

 	item_list = get_items(filters, additional_query_columns)
 	if item_list:
Author	SHA1	Message	Date
Frappe Bot	ccff3e2aec	Merge branch 'hotfix'	2018-11-07 11:26:10 +00:00
Frappe Bot	7f37d26f05	bumped to version 10.1.69	2018-11-07 11:26:10 +00:00
Shreya Shah	c704630d5f	fix: Return default if company not found (#15915 )	2018-11-06 17:24:45 +05:30