From c704630d5fd465c832a5f99914ff465bed9a5987 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 6 Nov 2018 17:24:45 +0530 Subject: [PATCH 1/2] fix: Return default if company not found (#15915) --- .../report/item_wise_sales_register/item_wise_sales_register.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 017a2c971b..1c12cdfe86 100644 --- 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: From 7f37d26f0527fba9cefcb55046ddd3b0671c4abf Mon Sep 17 00:00:00 2001 From: Frappe Bot Date: Wed, 7 Nov 2018 11:26:10 +0000 Subject: [PATCH 2/2] bumped to version 10.1.69 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 7c307b760b..7c26e1da6a 100644 --- 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'''