Merge branch 'master' into new-message-type

shridarpatil · Sep 9, 2024 · 6fd9d79 · 6fd9d79
2 parents 6a8781a + c5c8b9f
commit 6fd9d79
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/frappe_whatsapp/__init__.py b/frappe_whatsapp/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = 'v1.0.7'
+__version__ = '1.0.7'
diff --git a/frappe_whatsapp/frappe_whatsapp/doctype/whatsapp_message/whatsapp_message.py b/frappe_whatsapp/frappe_whatsapp/doctype/whatsapp_message/whatsapp_message.py
@@ -146,6 +146,11 @@ def format_number(self, number):
         return number
 
 
+
+def on_doctype_update():
+    frappe.db.add_index("WhatsApp Message", ["reference_doctype", "reference_name"])
+
+
 @frappe.whitelist()
 def send_template(to, reference_doctype, reference_name, template):
     try:

diff --git a/frappe_whatsapp/frappe_whatsapp/doctype/whatsapp_notification/whatsapp_notification.json b/frappe_whatsapp/frappe_whatsapp/doctype/whatsapp_notification/whatsapp_notification.json
@@ -1,11 +1,13 @@
 {
  "actions": [],
- "autoname": "format:{WN}-{####}",
+ "allow_rename": 1,
+ "autoname": "field:notification_name",
  "creation": "2022-10-27 22:04:58.515829",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "notification_name",
   "notification_type",
   "reference_doctype",
   "field_name",
@@ -181,15 +183,24 @@
    "fieldtype": "Select",
    "label": "Reference Date",
    "mandatory_depends_on": "eval:doc.doctype_event==='Days Before' || doc.doctype_event==='Days After'"
+  },
+  {
+   "fieldname": "notification_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Notification Name",
+   "reqd": 1,
+   "unique": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-08-11 20:11:35.462365",
+ "modified": "2024-08-24 13:53:36.666204",
  "modified_by": "Administrator",
  "module": "Frappe Whatsapp",
  "name": "WhatsApp Notification",
- "naming_rule": "Expression",
+ "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [
   {