fix: Move subscription process to hourly long quque

(cherry picked from commit 82a2f31) # Conflicts: # erpnext/hooks.py
frappe · Sep 27, 2022 · 447c553 · 447c553
1 parent b2e9dcc
commit 447c553
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
@@ -477,16 +477,20 @@
 		"erpnext.crm.doctype.social_media_post.social_media_post.process_scheduled_social_media_posts",
 	],
 	"hourly": [
+<<<<<<< HEAD
 		"erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.trigger_emails",
 		"erpnext.accounts.doctype.subscription.subscription.process_all",
 		"erpnext.erpnext_integrations.doctype.amazon_mws_settings.amazon_mws_settings.schedule_get_order_details",
+=======
+>>>>>>> 82a2f31ada (fix: Move subscription process to hourly long quque)
 		"erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.automatic_synchronization",
 		"erpnext.projects.doctype.project.project.hourly_reminder",
 		"erpnext.projects.doctype.project.project.collect_project_status",
 		"erpnext.support.doctype.issue.issue.set_service_level_agreement_variance",
 		"erpnext.erpnext_integrations.connectors.shopify_connection.sync_old_orders",
 	],
 	"hourly_long": [
+		"erpnext.accounts.doctype.subscription.subscription.process_all",
 		"erpnext.stock.doctype.repost_item_valuation.repost_item_valuation.repost_entries",
 		"erpnext.hr.doctype.shift_type.shift_type.process_auto_attendance_for_all_shifts",
 	],