Merge branch 'develop' into payments-based-dunning
This commit is contained in:
@@ -420,13 +420,10 @@ scheduler_events = {
|
||||
"daily_long": [
|
||||
"erpnext.setup.doctype.email_digest.email_digest.send",
|
||||
"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.auto_update_latest_price_in_all_boms",
|
||||
"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",
|
||||
"erpnext.crm.utils.open_leads_opportunities_based_on_todays_event",
|
||||
],
|
||||
"monthly_long": [
|
||||
"erpnext.accounts.deferred_revenue.process_deferred_accounting",
|
||||
"erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_demand_loans",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -472,9 +469,6 @@ bank_reconciliation_doctypes = [
|
||||
"Payment Entry",
|
||||
"Journal Entry",
|
||||
"Purchase Invoice",
|
||||
"Sales Invoice",
|
||||
"Loan Repayment",
|
||||
"Loan Disbursement",
|
||||
]
|
||||
|
||||
accounting_dimension_doctypes = [
|
||||
@@ -522,11 +516,22 @@ accounting_dimension_doctypes = [
|
||||
"Account Closing Balance",
|
||||
]
|
||||
|
||||
# get matching queries for Bank Reconciliation
|
||||
get_matching_queries = (
|
||||
"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_matching_queries"
|
||||
)
|
||||
|
||||
get_matching_vouchers_for_bank_reconciliation = "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_matching_vouchers_for_bank_reconciliation"
|
||||
|
||||
get_amounts_not_reflected_in_system_for_bank_reconciliation_statement = "erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement.get_amounts_not_reflected_in_system_for_bank_reconciliation_statement"
|
||||
|
||||
get_payment_entries_for_bank_clearance = (
|
||||
"erpnext.accounts.doctype.bank_clearance.bank_clearance.get_payment_entries_for_bank_clearance"
|
||||
)
|
||||
|
||||
get_entries_for_bank_clearance_summary = "erpnext.accounts.report.bank_clearance_summary.bank_clearance_summary.get_entries_for_bank_clearance_summary"
|
||||
|
||||
get_entries_for_bank_reconciliation_statement = "erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement.get_entries_for_bank_reconciliation_statement"
|
||||
|
||||
regional_overrides = {
|
||||
"France": {
|
||||
"erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"
|
||||
@@ -594,7 +599,6 @@ global_search_doctypes = {
|
||||
{"doctype": "Branch", "index": 35},
|
||||
{"doctype": "Department", "index": 36},
|
||||
{"doctype": "Designation", "index": 38},
|
||||
{"doctype": "Loan", "index": 44},
|
||||
{"doctype": "Maintenance Schedule", "index": 45},
|
||||
{"doctype": "Maintenance Visit", "index": 46},
|
||||
{"doctype": "Warranty Claim", "index": 47},
|
||||
|
||||
Reference in New Issue
Block a user