| commit | 9ccc43980bab10428bc2bd337fd95766e7f29fe7 | [log] [tgz] |
|---|---|---|
| author | Pranav Nachanekar <pranav@Pranavs-MacBook-Pro.local> | Wed Oct 09 14:17:37 2019 +0530 |
| committer | Pranav Nachanekar <pranav@Pranavs-MacBook-Pro.local> | Wed Oct 09 14:17:37 2019 +0530 |
| tree | d752d2dadf668c0a5609d1384af59ff3432176b4 | |
| parent | 604febb398f6f27c4caf6202d9ea557f9582ac54 [diff] | |
| parent | 50e66d81de0dff46d4cd1baf9317df76b2ae5f63 [diff] |
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
diff --git a/erpnext/crm/doctype/appointment/appointment.py b/erpnext/crm/doctype/appointment/appointment.py index 607584f..f575f52 100644 --- a/erpnext/crm/doctype/appointment/appointment.py +++ b/erpnext/crm/doctype/appointment/appointment.py
@@ -89,7 +89,6 @@ self.auto_assign() self.save(ignore_permissions=True) frappe.db.commit() - this.wrapper.find('.filter-edit-area').after(this.get_clear_button()) def create_lead(self): # Return if already linked
diff --git a/erpnext/www/book-appointment/index.py b/erpnext/www/book-appointment/index.py index e279a47..6f416d1 100644 --- a/erpnext/www/book-appointment/index.py +++ b/erpnext/www/book-appointment/index.py
@@ -59,7 +59,6 @@ query_start_time = query_start_time.astimezone(local_timezone) query_end_time = query_end_time.astimezone(local_timezone) now = datetime.datetime.now() - # now = local_timezone.localize(now) # Database queries settings = frappe.get_doc('Appointment Booking Settings') holiday_list = frappe.get_doc('Holiday List', settings.holiday_list)
diff --git a/erpnext/www/book-appointment/verify/index.py b/erpnext/www/book-appointment/verify/index.py index 6eda19f..e8ccecd 100644 --- a/erpnext/www/book-appointment/verify/index.py +++ b/erpnext/www/book-appointment/verify/index.py
@@ -1,4 +1,5 @@ import frappe + from frappe.utils.verified_command import verify_request @frappe.whitelist(allow_guest=True) def get_context(context):