From 571a9d0f198c53e675493d0af960cb715407af5e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Mar 2016 15:03:23 +0530 Subject: [PATCH 1/3] [fix] [tests] --- erpnext/controllers/recurring_document.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py index a853e10d87..2f5fccc390 100644 --- a/erpnext/controllers/recurring_document.py +++ b/erpnext/controllers/recurring_document.py @@ -3,13 +3,10 @@ import frappe 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 @@ def validate_recurring_document(doc): 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: From 0c1b8f4334953cc742117957a4e2599cce7eabe5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Mar 2016 16:47:36 +0530 Subject: [PATCH 2/3] [fix] [minor] autoload chart of accounts --- erpnext/accounts/page/accounts_browser/accounts_browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index fe19c32463..7e64ea3ad8 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -60,6 +60,7 @@ frappe.pages["Accounts Browser"].on_page_load = function(wrapper){ chart_area.get(0), wrapper.page); }) + wrapper.$company_select.change(); } frappe.pages["Accounts Browser"].on_page_show = function(wrapper){ From d3c04a3edacd347d869b40e867ad17b09b8db52a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Mar 2016 17:18:45 +0600 Subject: [PATCH 3/3] bumped to version 6.24.5 --- 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 43b4b20831..6a62acb59c 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/hooks.py b/erpnext/hooks.py index ad090840a2..12e8a2e422 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.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 8138205045..c080221ae9 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(