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

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi
2016-02-15 11:53:57 +05:30
parent f69b79fd16 0e553aa6b8
commit e4e8e775c4
5 changed files with 8 additions and 6 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.21.5' __version__ = '6.21.6'

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.21.5" app_version = "6.21.6"
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

@@ -280,7 +280,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var party_type = "Supplier"; var party_type = "Supplier";
var party_account_field = 'credit_to'; var party_account_field = 'credit_to';
} }
var party = me.frm.doc[frappe.model.scrub(party_type)]; var party = me.frm.doc[frappe.model.scrub(party_type)];
if(party) { if(party) {
return frappe.call({ return frappe.call({
@@ -643,7 +643,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
"item_code": d.item_code, "item_code": d.item_code,
"item_group": d.item_group, "item_group": d.item_group,
"brand": d.brand, "brand": d.brand,
"qty": d.qty "qty": d.qty,
"parenttype": d.parenttype,
"parent": d.parent
}); });
} }
}; };

2
erpnext/stock/get_item_details.py
View File

@@ -196,7 +196,7 @@ def get_default_cost_center(args, item):
or args.get("cost_center")) or args.get("cost_center"))
def get_price_list_rate(args, item_doc, out): def get_price_list_rate(args, item_doc, out):
meta = frappe.get_meta(args.doctype) meta = frappe.get_meta(args.parenttype or args.doctype)
if meta.get_field("currency"): if meta.get_field("currency"):
validate_price_list(args) validate_price_list(args)

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