From 75b145fe2cf942c92768bc5c3d071b9ddd21aba3 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Tue, 18 Jul 2017 16:05:52 +0530 Subject: [PATCH 1/3] [hotfix] used frappe.db.set value instead of frappe.set_value (#9923) --- erpnext/setup/setup_wizard/domainify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py index 90878af75c..7f333cc815 100644 --- a/erpnext/setup/setup_wizard/domainify.py +++ b/erpnext/setup/setup_wizard/domainify.py @@ -157,8 +157,8 @@ def update_module_def_restrict_to_domain(): lang = frappe.db.get_single_value("System Settings", "language") or "en" for module, domain in module_def_restrict_to_domain_mapper.iteritems(): if frappe.db.exists("Domain", _(domain, lang)): - frappe.set_value("Module Def", module, "restrict_to_domain", _(domain, lang)) + frappe.db.set_value("Module Def", module, "restrict_to_domain", _(domain, lang)) elif frappe.db.exists("Domain", domain): - frappe.set_value("Module Def", module, "restrict_to_domain", domain) + frappe.db.set_value("Module Def", module, "restrict_to_domain", domain) else: pass From 7f95d587b2404a5f935e2ae5c536c5f7fad6c58a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 18 Jul 2017 16:09:34 +0530 Subject: [PATCH 2/3] [fix] escape company filter (#9924) --- erpnext/setup/doctype/company/company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index a11f3acb18..c8a0507e8e 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -339,7 +339,7 @@ def update_company_monthly_sales(company): '''Cache past year monthly sales of every company based on sales invoices''' from frappe.utils.goal import get_monthly_results import json - filter_str = 'company = "'+ company +'" and status != "Draft"' + filter_str = "company = '{0}' and status != 'Draft'".format(frappe.db.escape(company)) month_to_value_dict = get_monthly_results("Sales Invoice", "grand_total", "posting_date", filter_str, "sum") frappe.db.sql((''' From 75e65e70791bd345fae42d31d79d3f4323177c55 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Tue, 18 Jul 2017 17:08:23 +0600 Subject: [PATCH 3/3] bumped to version 8.5.2 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 9f37fbb5f6..645fc69e04 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.5.1' +__version__ = '8.5.2' def get_default_company(user=None): '''Get default company for user'''