vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fixes] timezone

Browse source
This commit is contained in:
Rushabh Mehta 2015-05-28 16:59:16 +05:30
parent 0b93f99613
commit fc8c5ca42e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/auth.py
View file

@ -192,7 +192,7 @@ class LoginManager:
return
from frappe.utils import now_datetime
current_hour = int(now_datetime(user=frappe.form_dict.get('usr')).strftime('%H'))
current_hour = int(now_datetime().strftime('%H'))
if login_before and current_hour > login_before:
frappe.throw(_("Login not allowed at this time"), frappe.AuthenticationError)

6
frappe/public/js/frappe/desk.js
View file

@ -72,7 +72,11 @@ frappe.Application = Class.extend({
moment.locale(frappe.boot.lang);
if(frappe.boot.timezone_info) {
moment.tz.add(frappe.boot.timezone_info);
moment.system_utc_offset = moment().tz(sys_defaults.time_zone).utcOffset();
if(sys_defaults.time_zone) {
moment.system_utc_offset = moment().tz(sys_defaults.time_zone).utcOffset();
} else {
moment.system_utc_offset = moment().utcOffset();
}
moment.user_utc_offset = moment().utcOffset();
}
if(frappe.boot.print_css) {