Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Saurabh 2017-11-03 16:56:23 +05:30
commit 0faa61009f
3 changed files with 5 additions and 4 deletions
Show Stats 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
from erpnext.hooks import regional_overrides
__version__ = '9.2.3'
__version__ = '9.2.4'
def get_default_company(user=None):
'''Get default company for user'''

2
erpnext/public/js/utils.js
View File

@ -38,7 +38,7 @@ $.extend(erpnext, {
},
stale_rate_allowed: () => {
return cint(frappe.boot.sysdefaults.allow_stale) || 1;
return cint(frappe.boot.sysdefaults.allow_stale);
},
setup_serial_no: function() {

5
erpnext/startup/boot.py
View File

@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint
def boot_session(bootinfo):
"""boot session - send website info if guest"""
@ -19,8 +20,8 @@ def boot_session(bootinfo):
'territory')
bootinfo.sysdefaults.customer_group = frappe.db.get_single_value('Selling Settings',
'customer_group')
bootinfo.sysdefaults.allow_stale = frappe.db.get_single_value('Accounts Settings',
'allow_stale') or 1
bootinfo.sysdefaults.allow_stale = cint(frappe.db.get_single_value('Accounts Settings',
'allow_stale'))
bootinfo.notification_settings = frappe.get_doc("Notification Control",
"Notification Control")