From b59df1118e31221ba305ba05de4a761e4a58496e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 21 Dec 2021 16:04:22 +0530
Subject: [PATCH 1/2] fix: missed colon (#28979) (#28984)

(cherry picked from commit 076cb408db6577d3901e339d298064760f47edb0)

Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
---
 erpnext/hooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 6d57c83e6a5..00e46393590 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -388,7 +388,7 @@ scheduler_events = {
 		"erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_appointment_status",
 		"erpnext.buying.doctype.supplier_quotation.supplier_quotation.set_expired_status",
 		"erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email",
-		"erpnext.non_profit.doctype.membership.membership.set_expired_status"
+		"erpnext.non_profit.doctype.membership.membership.set_expired_status",
 		"erpnext.hr.doctype.interview.interview.send_daily_feedback_reminder"
 	],
 	"daily_long": [

From dd01c0e854401ea05d94634da23f77640950a2ef Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:43:00 +0530
Subject: [PATCH 2/2] fix: Currency fix for `cost` field in subscription plan
 (#28821) (#28898)

(cherry picked from commit be103ab8e6a172a4cfb25e85d3985fa46a2cfc50)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
---
 .../doctype/subscription_plan/subscription_plan.json         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
index 878ae098891..563df79eec7 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
@@ -75,7 +75,8 @@
    "fieldname": "cost",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Cost"
+   "label": "Cost",
+   "options": "currency"
   },
   {
    "depends_on": "eval:doc.price_determination==\"Based On Price List\"",
@@ -147,7 +148,7 @@
   }
  ],
  "links": [],
- "modified": "2021-08-13 10:53:44.205774",
+ "modified": "2021-12-10 15:24:15.794477",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription Plan",