chore: conflicts

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py

@@ -143,13 +143,9 @@ def trigger_job_for_doc(docname: str | None = None):
 	if not docname:
 		return
 
-<<<<<<< HEAD
-	if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
-=======
 	frappe.has_permission("Process Payment Reconciliation", "write", doc=docname, throw=True)
 
-	if not frappe.get_single_value("Accounts Settings", "auto_reconcile_payments"):
->>>>>>> 2ae6451f10 (fix: Add authorization checks on internal functions (backport #55709) (#55726))
+	if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
 		frappe.throw(
 			_("Auto Reconciliation of Payments has been disabled. Enable it through {0}").format(
 				get_link_to_form("Accounts Settings", "Accounts Settings")

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -2085,12 +2085,8 @@ def make_stock_entry(source_name, target_doc=None):
 @frappe.whitelist()
 def change_release_date(name, release_date=None):
 	if frappe.db.exists("Purchase Invoice", name):
-<<<<<<< HEAD
 		pi = frappe.get_doc("Purchase Invoice", name)
-=======
-		pi = frappe.get_lazy_doc("Purchase Invoice", name)
 		pi.check_permission()
->>>>>>> 2ae6451f10 (fix: Add authorization checks on internal functions (backport #55709) (#55726))
 		pi.db_set("release_date", release_date)
 
 

erpnext/setup/doctype/employee/employee.py

@@ -321,12 +321,9 @@ def deactivate_sales_person(status=None, employee=None):
 @frappe.whitelist()
 def create_user(employee, user=None, email=None):
 	emp = frappe.get_doc("Employee", employee)
-<<<<<<< HEAD
-=======
 	emp.check_permission("write")
 	if emp.user_id:
 		frappe.throw(_("Employee {0} already has a linked user").format(emp.name))
->>>>>>> 2ae6451f10 (fix: Add authorization checks on internal functions (backport #55709) (#55726))
 
 	employee_name = emp.employee_name.split(" ")
 	middle_name = last_name = ""