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

Merge pull request #34301 from barredterra/rename-timezone-utils

Browse Source 
refactor: use renamed timezone utils
This commit is contained in:
Sagar Sharma 2023-03-06 22:22:23 +05:30 committed by GitHub
commit 04b346865f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats 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,
@ -981,7 +981,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_time_zone() return frappe.db.get_value("User", user, "time_zone") or get_system_timezone()
@frappe.whitelist() @frappe.whitelist()

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

@ -10,6 +10,7 @@ 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
@ -64,7 +65,7 @@ def update_youtube_data():
frequency = get_frequency(frequency) frequency = get_frequency(frequency)
time = datetime.now() time = datetime.now()
timezone = pytz.timezone(frappe.utils.get_time_zone()) timezone = pytz.timezone(get_system_timezone())
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,6 +4,7 @@ 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"]
@ -125,7 +126,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(frappe.utils.get_time_zone()) local_timezone = pytz.timezone(get_system_timezone())
datetimeobject = local_timezone.localize(datetimeobject) datetimeobject = local_timezone.localize(datetimeobject)
datetimeobject = datetimeobject.astimezone(guest_tz) datetimeobject = datetimeobject.astimezone(guest_tz)
return datetimeobject return datetimeobject
@ -134,7 +135,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(frappe.utils.get_time_zone()) system_tz = pytz.timezone(get_system_timezone())
datetimeobject = datetimeobject.astimezone(system_tz) datetimeobject = datetimeobject.astimezone(system_tz)
return datetimeobject return datetimeobject