Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta 2016-03-03 16:48:45 +05:30
commit a0b21235d7
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.24.4' __version__ = '6.24.5'

1
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@ -60,6 +60,7 @@ frappe.pages["Accounts Browser"].on_page_load = function(wrapper){
chart_area.get(0), wrapper.page); chart_area.get(0), wrapper.page);
}) })
wrapper.$company_select.change();
} }
frappe.pages["Accounts Browser"].on_page_show = function(wrapper){ frappe.pages["Accounts Browser"].on_page_show = function(wrapper){

9
erpnext/controllers/recurring_document.py
View File

@ -3,13 +3,10 @@ import frappe
import frappe.utils import frappe.utils
import frappe.defaults import frappe.defaults
from frappe.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \ from frappe.utils import cint, cstr, getdate, nowdate, \
get_first_day, get_last_day, comma_and, split_emails get_first_day, get_last_day, split_emails
from frappe.model.naming import make_autoname
from frappe import _, msgprint, throw 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} month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
date_field_map = { date_field_map = {
@ -166,7 +163,7 @@ def validate_recurring_document(doc):
if doc.is_recurring: if doc.is_recurring:
validate_notification_email_id(doc) 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 doc.recurring_id = doc.name
if not doc.recurring_type: if not doc.recurring_type:

2
erpnext/hooks.py
View File

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

2
setup.py
View File

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