fix: add before_print in doctype event (#25858)

(cherry picked from commit 9ee221b) # Conflicts: # frappe/core/doctype/server_script/server_script.json # frappe/core/doctype/server_script/server_script_utils.py
frappe · Apr 8, 2024 · 22cb01b · 22cb01b
1 parent 180c3b2
commit 22cb01b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json
@@ -57,7 +57,11 @@
    "fieldname": "doctype_event",
    "fieldtype": "Select",
    "label": "DocType Event",
+<<<<<<< HEAD
    "options": "Before Insert\nBefore Validate\nBefore Save\nAfter Insert\nAfter Save\nBefore Rename\nAfter Rename\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)\nOn Payment Authorization"
+=======
+   "options": "Before Insert\nBefore Validate\nBefore Save\nAfter Insert\nAfter Save\nBefore Rename\nAfter Rename\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)\nBefore Print\nOn Payment Authorization\nOn Payment Paid\nOn Payment Failed"
+>>>>>>> 9ee221bc41 (fix: add before_print in doctype event (#25858))
   },
   {
    "depends_on": "eval:doc.script_type==='API'",
@@ -151,7 +155,11 @@
    "link_fieldname": "server_script"
   }
  ],
+<<<<<<< HEAD
  "modified": "2024-02-27 11:44:46.397495",
+=======
+ "modified": "2024-04-08 16:18:52.901097",
+>>>>>>> 9ee221bc41 (fix: add before_print in doctype event (#25858))
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Server Script",

diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py
@@ -46,6 +46,7 @@ class ServerScript(Document):
 			"After Delete",
 			"Before Save (Submitted Document)",
 			"After Save (Submitted Document)",
+			"Before Print",
 			"On Payment Authorization",
 		]
 		enable_rate_limit: DF.Check

diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py
@@ -19,6 +19,12 @@
 	"after_delete": "After Delete",
 	"before_update_after_submit": "Before Save (Submitted Document)",
 	"on_update_after_submit": "After Save (Submitted Document)",
+<<<<<<< HEAD
+=======
+	"before_print": "Before Print",
+	"on_payment_paid": "On Payment Paid",
+	"on_payment_failed": "On Payment Failed",
+>>>>>>> 9ee221bc41 (fix: add before_print in doctype event (#25858))
 	"on_payment_authorized": "On Payment Authorization",
 }