diff --git a/.gitignore b/.gitignore index 0818a02453..e9e476b0a9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ server_tools patch.log lib versions-local.db +user_files *.sql* diff --git a/erpnext/accounts/doctype/gl_control/gl_control.py b/erpnext/accounts/doctype/gl_control/gl_control.py index bab86267c1..5365bbce09 100644 --- a/erpnext/accounts/doctype/gl_control/gl_control.py +++ b/erpnext/accounts/doctype/gl_control/gl_control.py @@ -506,10 +506,10 @@ def manage_recurring_invoices(): Create recurring invoices on specific date by copying the original one and notify the concerned people """ - rv = sql("""select name, recurring_id from `tabReceivable Voucher` where ifnull(convert_into_recurring_invoice, 0) = 1 + rv = webnotes.conn.sql("""select name, recurring_id from `tabReceivable Voucher` where ifnull(convert_into_recurring_invoice, 0) = 1 and next_date = %s and next_date <= end_date order by next_date desc""", nowdate()) for d in rv: - if not sql("""select name from `tabReceivable Voucher` where posting_date = %s and recurring_id = %s""", (nowdate(), d[1])): + if not webnotes.conn.sql("""select name from `tabReceivable Voucher` where posting_date = %s and recurring_id = %s""", (nowdate(), d[1])): prev_rv = get_obj('Receivable Voucher', d[0], with_children=1) new_rv = create_new_invoice(prev_rv) diff --git a/index.html b/index.html index 159b2e261a..bc3673c470 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@