nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar
2017-07-18 16:38:24 +05:30
parent bc3acdd0ba 3951f6971e
commit d36c136fc6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '8.5.1' __version__ = '8.5.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/setup/doctype/company/company.py
View File

@@ -339,7 +339,7 @@ def update_company_monthly_sales(company):
'''Cache past year monthly sales of every company based on sales invoices''' '''Cache past year monthly sales of every company based on sales invoices'''
from frappe.utils.goal import get_monthly_results from frappe.utils.goal import get_monthly_results
import json 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") month_to_value_dict = get_monthly_results("Sales Invoice", "grand_total", "posting_date", filter_str, "sum")
frappe.db.sql((''' frappe.db.sql(('''

4
erpnext/setup/setup_wizard/domainify.py
View File

@@ -157,8 +157,8 @@ def update_module_def_restrict_to_domain():
lang = frappe.db.get_single_value("System Settings", "language") or "en" lang = frappe.db.get_single_value("System Settings", "language") or "en"
for module, domain in module_def_restrict_to_domain_mapper.iteritems(): for module, domain in module_def_restrict_to_domain_mapper.iteritems():
if frappe.db.exists("Domain", _(domain, lang)): 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): 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: else:
pass pass