Merge branch 'develop' into setup_wizard

This commit is contained in:
Rucha Mahabal
2019-11-27 11:55:53 +05:30
committed by GitHub
150 changed files with 7305 additions and 11710 deletions

View File

@@ -299,7 +299,8 @@ scheduler_events = {
"erpnext.quality_management.doctype.quality_review.quality_review.review",
"erpnext.support.doctype.service_level_agreement.service_level_agreement.check_agreement_status",
"erpnext.crm.doctype.email_campaign.email_campaign.send_email_to_leads_or_contacts",
"erpnext.crm.doctype.email_campaign.email_campaign.set_email_campaign_status"
"erpnext.crm.doctype.email_campaign.email_campaign.set_email_campaign_status",
"erpnext.selling.doctype.quotation.set_expired_status"
],
"daily_long": [
"erpnext.setup.doctype.email_digest.email_digest.send",