Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
index.html
version.num
diff --git a/.gitignore b/.gitignore
index 0ef6ee5..a99a7b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
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 bab8626..5365bbc 100644
--- a/erpnext/accounts/doctype/gl_control/gl_control.py
+++ b/erpnext/accounts/doctype/gl_control/gl_control.py
@@ -506,10 +506,10 @@
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 7cb60c2..ebe217b 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
- <script type="text/javascript">window._version_number="48"
+ <script type="text/javascript">window._version_number="49"
wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
parent=parent[n];}}
diff --git a/version.num b/version.num
index 21e72e8..95f9650 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-48
+49