From 18bfad5a661c9b21469b1a6400a4159389c36bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Ayala?= Date: Wed, 2 Mar 2016 10:05:45 -0300 Subject: [PATCH 1/4] Update concepts-and-terms.md --- erpnext/docs/user/manual/en/introduction/concepts-and-terms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md index e445963c0d..7761198b4f 100644 --- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md +++ b/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 From 32362f14f45217a8c5043b9ec8089199f8ea3d0c Mon Sep 17 00:00:00 2001 From: Agus Syahputra Date: Thu, 3 Mar 2016 08:03:59 +0700 Subject: [PATCH 2/4] Update item-price.md --- erpnext/docs/user/manual/en/stock/item/item-price.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/docs/user/manual/en/stock/item/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md index b877e8dd55..342e41989c 100644 --- a/erpnext/docs/user/manual/en/stock/item/item-price.md +++ b/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. From 756e518bc181e3e3aa2a8de1e4c43056cc0d8c99 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Mar 2016 13:00:17 +0530 Subject: [PATCH 3/4] [fix] recurring --- erpnext/controllers/recurring_document.py | 6 +++--- erpnext/public/js/controllers/transaction.js | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py index d5499a3769..a853e10d87 100644 --- a/erpnext/controllers/recurring_document.py +++ b/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: diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 8c4b36de0d..c1e801d2fa 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/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); } From a8d04b11c37cb65f7ab413629e48932449ce857b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Mar 2016 13:32:23 +0600 Subject: [PATCH 4/4] bumped to version 6.24.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 42a4248dc0..6fc38557be 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.24.1' +__version__ = '6.24.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 4da7da3bd9..7082e3d34d 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index 4a0f32e129..d5dd10cca0 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.1" +version = "6.24.2" requirements = parse_requirements("requirements.txt", session="") setup(