Skip to content

Commit

Permalink
Merge branch 'develop' into fix-get_single_value
Browse files Browse the repository at this point in the history
  • Loading branch information
ankush committed Jan 10, 2024
2 parents d4d9e6c + 2178fdc commit 0255642
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 2 additions & 4 deletions erpnext/projects/doctype/project/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,18 +370,16 @@ def get_timeline_data(doctype: str, name: str) -> dict[int, int]:
def get_project_list(
doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
):
user = frappe.session.user
customers, suppliers = get_customers_suppliers("Project", frappe.session.user)

ignore_permissions = False
if is_website_user():
if is_website_user() and frappe.session.user != "Guest":
if not filters:
filters = []

if customers:
filters.append([doctype, "customer", "in", customers])

ignore_permissions = True
ignore_permissions = True

meta = frappe.get_meta(doctype)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def get_max_year_end_date(company):
return query[0][0] if query else None

def validate_accounts_freeze(self):
acc_settings = frappe.db.get_singles_dict("Accounts Settings", cast=True)
acc_settings = frappe.get_cached_doc("Account Settings")
if not acc_settings.acc_frozen_upto:
return
if getdate(self.posting_date) <= getdate(acc_settings.acc_frozen_upto):
Expand Down
3 changes: 1 addition & 2 deletions erpnext/utilities/doctype/video/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ def get_frequency(value):

def update_youtube_data():
# Called every 30 minutes via hooks
video_settings = frappe.db.get_singles_dict("Video Settings", cast=True)

video_settings = frappe.get_cached_doc("Video Settings")
if not video_settings.enable_youtube_tracking:
return

Expand Down

0 comments on commit 0255642

Please sign in to comment.