Merge branch 'develop'

bumped to version 6.18.4
[hotfix] get_price_list_rate
2016-01-21 22:32:08 +05:30 · 2016-01-21 23:02:08 +06:00 · 2016-01-21 22:28:55 +05:30 · 2016-01-21 21:06:34 +05:30 · 2016-01-21 21:36:34 +06:00 · 2016-01-21 21:04:16 +05:30
5 changed files with 8 additions and 8 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.18.2'
+__version__ = '6.18.4'
--- 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.18.2"
+app_version = "6.18.4"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -184,8 +184,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 							is_subcontracted: me.frm.doc.is_subcontracted,
 							transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date,
 							ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,
-							doctype: me.frm.doctype,
-							name: me.frm.name,
+							doctype: me.frm.doc.doctype,
+							name: me.frm.doc.name,
 							project_name: item.project_name || me.frm.doc.project_name,
 							qty: item.qty
 						}
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -84,7 +84,7 @@ def process_args(args):
 		args.item_code = get_item_code(barcode=args.barcode)
 	elif not args.item_code and args.serial_no:
 		args.item_code = get_item_code(serial_no=args.serial_no)
-	
+
 	set_transaction_type(args)

 	return args
@@ -200,7 +200,7 @@ def get_default_cost_center(args, item):
 		or args.get("cost_center"))

 def get_price_list_rate(args, item_doc, out):
-	meta = frappe.get_meta(args.parenttype)
+	meta = frappe.get_meta(args.doctype)

 	if meta.get_field("currency"):
 		validate_price_list(args)
@@ -288,7 +288,7 @@ def get_party_item_code(args, item_doc, out):
 	if args.transaction_type=="selling" and args.customer:
 		customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
 		out.customer_item_code = customer_item_code[0].ref_code if customer_item_code else None
-		
+
 	if args.transaction_type=="buying" and args.supplier:
 		item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
 		out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements

-version = "6.18.2"
+version = "6.18.4"
 requirements = parse_requirements("requirements.txt", session="")

 setup(
Author	SHA1	Message	Date
Anand Doshi	f7e9a9d786	Merge branch 'develop'	2016-01-21 22:32:08 +05:30
Anand Doshi	04230cb656	bumped to version 6.18.4	2016-01-21 23:02:08 +06:00
Anand Doshi	54abf025b7	[hotfix] get_price_list_rate	2016-01-21 22:28:55 +05:30
Anand Doshi	39ac535bdb	Merge branch 'develop'	2016-01-21 21:06:34 +05:30
Anand Doshi	dd74b5d44f	bumped to version 6.18.3	2016-01-21 21:36:34 +06:00
Anand Doshi	afe85bdd04	[hotfix] use me.frm.doc in get_item_details	2016-01-21 21:04:16 +05:30