CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-27 23:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: use renamed timezone utils (#34301)"

Browse Source 
Revert "refactor: use renamed timezone utils (#34301)"

This reverts commit 164933aae8.
This commit is contained in:
Deepesh Garg
2023-03-07 17:56:57 +05:30
committed by GitHub
parent 164933aae8
commit a2e001a2da
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/support/doctype/service_level_agreement/service_level_agreement.py
View File

@@ -13,8 +13,8 @@ from frappe.utils import (
get_datetime, get_datetime,
get_datetime_str, get_datetime_str,
get_link_to_form, get_link_to_form,
get_system_timezone,
get_time, get_time,
get_time_zone,
get_weekdays, get_weekdays,
getdate, getdate,
nowdate, nowdate,
@@ -978,7 +978,7 @@ def convert_utc_to_user_timezone(utc_timestamp, user):
def get_tz(user): def get_tz(user):
return frappe.db.get_value("User", user, "time_zone") or get_system_timezone() return frappe.db.get_value("User", user, "time_zone") or get_time_zone()
@frappe.whitelist() @frappe.whitelist()

3
erpnext/utilities/doctype/video/video.py
View File

@@ -10,7 +10,6 @@ import pytz
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import cint from frappe.utils import cint
from frappe.utils.data import get_system_timezone
from pyyoutube import Api from pyyoutube import Api
@@ -65,7 +64,7 @@ def update_youtube_data():
frequency = get_frequency(frequency) frequency = get_frequency(frequency)
time = datetime.now() time = datetime.now()
timezone = pytz.timezone(get_system_timezone()) timezone = pytz.timezone(frappe.utils.get_time_zone())
site_time = time.astimezone(timezone) site_time = time.astimezone(timezone)
if frequency == 30: if frequency == 30:

5
erpnext/www/book_appointment/index.py
View File

@@ -4,7 +4,6 @@ import json
import frappe import frappe
import pytz import pytz
from frappe import _ from frappe import _
from frappe.utils.data import get_system_timezone
WEEKDAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] WEEKDAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
@@ -126,7 +125,7 @@ def filter_timeslots(date, timeslots):
def convert_to_guest_timezone(guest_tz, datetimeobject): def convert_to_guest_timezone(guest_tz, datetimeobject):
guest_tz = pytz.timezone(guest_tz) guest_tz = pytz.timezone(guest_tz)
local_timezone = pytz.timezone(get_system_timezone()) local_timezone = pytz.timezone(frappe.utils.get_time_zone())
datetimeobject = local_timezone.localize(datetimeobject) datetimeobject = local_timezone.localize(datetimeobject)
datetimeobject = datetimeobject.astimezone(guest_tz) datetimeobject = datetimeobject.astimezone(guest_tz)
return datetimeobject return datetimeobject
@@ -135,7 +134,7 @@ def convert_to_guest_timezone(guest_tz, datetimeobject):
def convert_to_system_timezone(guest_tz, datetimeobject): def convert_to_system_timezone(guest_tz, datetimeobject):
guest_tz = pytz.timezone(guest_tz) guest_tz = pytz.timezone(guest_tz)
datetimeobject = guest_tz.localize(datetimeobject) datetimeobject = guest_tz.localize(datetimeobject)
system_tz = pytz.timezone(get_system_timezone()) system_tz = pytz.timezone(frappe.utils.get_time_zone())
datetimeobject = datetimeobject.astimezone(system_tz) datetimeobject = datetimeobject.astimezone(system_tz)
return datetimeobject return datetimeobject