schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict in hooks file

Browse Source
This commit is contained in:
rohitwaghchaure
2022-12-20 11:49:22 +05:30
committed by GitHub
parent 4dbce87660
commit 2a18067aad
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hooks.py
View File

@@ -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"],