nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 04:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta
2016-03-03 13:02:23 +05:30
parent a289ab75bf a8d04b11c3
commit abb6aa434e
7 changed files with 14 additions and 8 deletions
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.1' __version__ = '6.24.2'

6
erpnext/controllers/recurring_document.py
View File

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

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

@@ -16,7 +16,7 @@ share the Customer, Supplier and Item records.
#### Customer #### 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. You can create multiple Contacts and Addresses for each Customer.
> Selling > Customer > Selling > Customer

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

@@ -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. There are two ways to reach to new Item Price form.

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.1" app_version = "6.24.2"
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"

6
erpnext/public/js/controllers/transaction.js
View File

@@ -839,6 +839,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
is_recurring: function() { is_recurring: function() {
// set default values for recurring documents // 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) { if(!this.frm.doc.recurring_id) {
this.frm.set_value('recurring_id', this.frm.doc.name); this.frm.set_value('recurring_id', this.frm.doc.name);
} }

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.1" version = "6.24.2"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(