From 2a18067aadb2e03cf42b8feea12436909979b0a6 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 20 Dec 2022 11:49:22 +0530 Subject: [PATCH] fix: conflict in hooks file --- erpnext/hooks.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 52ee7a17bba..850daf9efed 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -525,12 +525,8 @@ scheduler_events = { "erpnext.hr.utils.allocate_earned_leaves", "erpnext.loan_management.doctype.process_loan_security_shortfall.process_loan_security_shortfall.create_process_loan_security_shortfall", "erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_term_loans", -<<<<<<< HEAD "erpnext.crm.doctype.lead.lead.daily_open_lead", -======= - "erpnext.crm.utils.open_leads_opportunities_based_on_todays_event", "erpnext.stock.doctype.stock_entry.stock_entry.audit_incorrect_valuation_entries", ->>>>>>> f31612376a (test: added test case to validate audit for incorrect entries) ], "weekly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_weekly"], "monthly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_monthly"],