Skip to content

fix: projects website list visible for guests and all logged in customers by 0xD0M1M0 [frappe] PR#39164 [backport/v4]

Bot Dokos requested to merge backport/v4-dev/1248 into v4-dev

Backport of !1248 (merged)

Conflicts detected for source commit: cd3b18e7d17b25c6f6c8b5b5cff011e9fb5f09b0
diff --cc erpnext/accounts/report/general_ledger/general_ledger.py
index 139d381172,6a3545dff1..0000000000
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@@ -276,6 -276,9 +276,12 @@@ def get_conditions(filters)
  	if filters.get("voucher_no"):
  		conditions.append("voucher_no=%(voucher_no)s")
  
++<<<<<<< HEAD
++=======
+ 	if filters.get("against_voucher_no"):
+ 		conditions.append("against_voucher=%(against_voucher_no)s")
+ 
++>>>>>>> cd3b18e7d17b25c6f6c8b5b5cff011e9fb5f09b0
  	if filters.get("voucher_no_not_in"):
  		conditions.append("voucher_no not in %(voucher_no_not_in)s")
  

Conflicts detected for source commit: 49c21eb2a16d7902927e7291c3c16aeb40fac459
diff --cc erpnext/accounts/report/general_ledger/general_ledger.py
index 139d381172,6a3545dff1..0000000000
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@@ -276,6 -276,9 +276,12 @@@ def get_conditions(filters)
  	if filters.get("voucher_no"):
  		conditions.append("voucher_no=%(voucher_no)s")
  
++<<<<<<< HEAD
++=======
+ 	if filters.get("against_voucher_no"):
+ 		conditions.append("against_voucher=%(against_voucher_no)s")
+ 
++>>>>>>> 49c21eb2a16d7902927e7291c3c16aeb40fac459
  	if filters.get("voucher_no_not_in"):
  		conditions.append("voucher_no not in %(voucher_no_not_in)s")
  
diff --cc erpnext/projects/doctype/project/project.py
index 448f2fdce2,33ea684417..0000000000
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@@ -383,6 -385,8 +385,11 @@@ def get_timeline_data(doctype: str, nam
  def get_project_list(
  	doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
  ):
++<<<<<<< HEAD
++=======
+ 	from frappe.www.list import get_list
+ 
++>>>>>>> 49c21eb2a16d7902927e7291c3c16aeb40fac459
  	customers, suppliers = get_customers_suppliers("Project", frappe.session.user)
  
  	ignore_permissions = False

Merge request reports