Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.24.1'
+__version__ = '6.24.2'

erpnext/controllers/recurring_document.py

@@ -166,6 +166,9 @@ def validate_recurring_document(doc):
 	if doc.is_recurring:
 		validate_notification_email_id(doc)
 
+		if not doc.recurring_id:
+			doc.recurring_id = doc.name
+
 		if not doc.recurring_type:
 			msgprint(_("Please select {0}").format(doc.meta.get_label("recurring_type")),
 			raise_exception=1)
@@ -176,9 +179,6 @@ def validate_recurring_document(doc):
 #
 def convert_to_recurring(doc, posting_date):
     if doc.is_recurring:
-        if not doc.recurring_id:
-            frappe.db.set(doc, "recurring_id", doc.name)
-
         set_next_date(doc, posting_date)
 
     elif doc.recurring_id:

erpnext/docs/user/manual/en/introduction/concepts-and-terms.md

@@ -16,7 +16,7 @@ share the Customer, Supplier and Item records.
 
 #### Customer
 
-Represents a customer. A Customer can be an individual or an organizations.
+Represents a customer. A Customer can be an individual or an organization.
 You can create multiple Contacts and Addresses for each Customer.
 
 > Selling > Customer

erpnext/docs/user/manual/en/stock/item/item-price.md

@@ -1,4 +1,4 @@
-Item Price is the record in which you can log sellig and buying rate of an item.
+Item Price is the record in which you can log selling and buying rate of an item.
 
 There are two ways to reach to new Item Price form.
 

erpnext/hooks.py

@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.24.1"
+app_version = "6.24.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/public/js/controllers/transaction.js

@@ -839,6 +839,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	is_recurring: function() {
 		// set default values for recurring documents
+		if(this.frm.doc.is_recurring && this.frm.doc.__islocal) {
+			frappe.msgprint(__("Please set recurring after saving"));
+			this.frm.set_value('is_recurring', 0);
+			return;
+		}
+
 		if(!this.frm.doc.recurring_id) {
 			this.frm.set_value('recurring_id', this.frm.doc.name);
 		}

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.24.1"
+version = "6.24.2"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(