ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts in backport of #60823

Browse Source
This commit is contained in:
Nabin Hait
2026-10-24 10:12:20 +05:30
parent c469dfd95f
commit 3c96807f2f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/crm/doctype/appointment/appointment.py
-5
View File
@@ -8,12 +8,7 @@ from urllib.parse import urlencode
import frappe
from frappe import _
<<<<<<< HEAD
from frappe.desk.form.assign_to import add as add_assignment
=======
from frappe.desk.form.assign_to import _add as add_assignment
from frappe.desk.form.assign_to import clear as clear_assignments
>>>>>>> 3773a8e (fix(appointment): verify portal booking without switching user)
from frappe.model.document import Document
from frappe.share import add_docshare
from frappe.utils import add_to_date, cint, date_diff, get_datetime, get_url, getdate, now, now_datetime