Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 43b4b20..6a62acb 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.24.4'
+__version__ = '6.24.5'
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index fe19c32..7e64ea3 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -60,6 +60,7 @@
chart_area.get(0), wrapper.page);
})
+ wrapper.$company_select.change();
}
frappe.pages["Accounts Browser"].on_page_show = function(wrapper){
diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index a853e10..2f5fccc 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -3,13 +3,10 @@
import frappe.utils
import frappe.defaults
-from frappe.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \
- get_first_day, get_last_day, comma_and, split_emails
-from frappe.model.naming import make_autoname
+from frappe.utils import cint, cstr, getdate, nowdate, \
+ get_first_day, get_last_day, split_emails
from frappe import _, msgprint, throw
-from erpnext.accounts.party import get_party_account, get_due_date, get_party_details
-from frappe.model.mapper import get_mapped_doc
month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
date_field_map = {
@@ -166,7 +163,7 @@
if doc.is_recurring:
validate_notification_email_id(doc)
- if not doc.recurring_id:
+ if not doc.recurring_id and not doc.is_new():
doc.recurring_id = doc.name
if not doc.recurring_type:
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ad09084..12e8a2e 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.24.4"
+app_version = "6.24.5"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/setup.py b/setup.py
index 8138205..c080221 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.24.4"
+version = "6.24.5"
requirements = parse_requirements("requirements.txt", session="")
setup(