nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 05:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-get_single_value

Browse Source
This commit is contained in:
Ankush Menat
2024-01-10 10:42:12 +05:30
parent d4d9e6c6fa 2178fdc65a
commit 0255642deb
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/projects/doctype/project/project.py
View File

@@ -370,18 +370,16 @@ def get_timeline_data(doctype: str, name: str) -> dict[int, int]:
def get_project_list( def get_project_list(
doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified" 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) customers, suppliers = get_customers_suppliers("Project", frappe.session.user)
ignore_permissions = False ignore_permissions = False
if is_website_user(): if is_website_user() and frappe.session.user != "Guest":
if not filters: if not filters:
filters = [] filters = []
if customers: if customers:
filters.append([doctype, "customer", "in", customers]) filters.append([doctype, "customer", "in", customers])
ignore_permissions = True
ignore_permissions = True
meta = frappe.get_meta(doctype) meta = frappe.get_meta(doctype)

2
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@@ -140,7 +140,7 @@ class RepostItemValuation(Document):
return query[0][0] if query else None return query[0][0] if query else None
def validate_accounts_freeze(self): 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: if not acc_settings.acc_frozen_upto:
return return
if getdate(self.posting_date) <= getdate(acc_settings.acc_frozen_upto): if getdate(self.posting_date) <= getdate(acc_settings.acc_frozen_upto):

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

@@ -78,8 +78,7 @@ def get_frequency(value):
def update_youtube_data(): def update_youtube_data():
# Called every 30 minutes via hooks # 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: if not video_settings.enable_youtube_tracking:
return return