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

fix: set system time on doc for Now (#18288)

Browse source
This commit is contained in:
Ankush Menat 2022-10-08 19:53:08 +05:30 • committed by GitHub
parent e2fdb7e261
commit 4a3259ed92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/public/js/frappe/model/create_new.js
View file

@ -190,7 +190,12 @@ $.extend(frappe.model, {
} else if (default_val == "Today") {
value = frappe.datetime.get_today();
} else if ((default_val || "").toLowerCase() === "now") {
value = frappe.datetime.now_datetime();
if (df.fieldtype == "Time") {
value = frappe.datetime.now_time();
} else {
// datetime fields are stored in system tz
value = frappe.datetime.system_datetime();
}
} else if (default_val[0] === ":") {
var boot_doc = frappe.model.get_default_from_boot_docs(df, doc, parent_doc);
var is_allowed_boot_doc =

26
frappe/public/js/frappe/utils/datetime.js
View file

@ -211,17 +211,21 @@ $.extend(frappe.datetime, {
return frappe.datetime._date(frappe.defaultDatetimeFormat, as_obj);
},
_date: function (format, as_obj = false) {
/**
* Whenever we are getting now_date/datetime, always make sure dates are fetched using user time zone.
* This is to make sure that time is as per user time zone set in User doctype, If a user had to change the timezone,
* we will end up having multiple timezone by not honouring timezone in User doctype.
* This will make sure that at any point we know which timezone the user if following and not have random timezone
* when the timezone of the local machine changes.
*/
let time_zone = frappe.boot.time_zone
? frappe.boot.time_zone.user || frappe.boot.time_zone.system
: frappe.sys_defaults.time_zone;
system_datetime: function (as_obj = false) {
return frappe.datetime._date(frappe.defaultDatetimeFormat, as_obj, true);
},
_date: function (format, as_obj = false, system_time = false) {
let time_zone = frappe.boot.time_zone?.system || frappe.sys_defaults.time_zone;
// Whenever we are getting now_date/datetime, always make sure dates are fetched using user time zone.
// This is to make sure that time is as per user time zone set in User doctype, If a user had to change the timezone,
// we will end up having multiple timezone by not honouring timezone in User doctype.
// This will make sure that at any point we know which timezone the user if following and not have random timezone
// when the timezone of the local machine changes.
if (!system_time) {
time_zone = frappe.boot.time_zone?.user || time_zone;
}
let date = moment.tz(time_zone);
return as_obj ? frappe.datetime.moment_to_date_obj(date) : date.format(format);