From 39a289145c37012036fcb3fbe3e1fc0e645e77f8 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 15 Feb 2016 11:42:18 +0530 Subject: [PATCH 1/2] [fix] fetch price list rate --- erpnext/public/js/controllers/transaction.js | 6 ++++-- erpnext/stock/get_item_details.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index b6698df0b8..5c93ef0b5d 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -280,7 +280,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var party_type = "Supplier"; var party_account_field = 'credit_to'; } - + var party = me.frm.doc[frappe.model.scrub(party_type)]; if(party) { return frappe.call({ @@ -643,7 +643,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ "item_code": d.item_code, "item_group": d.item_group, "brand": d.brand, - "qty": d.qty + "qty": d.qty, + "parenttype": d.parenttype, + "parent": d.parent }); } }; diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 55483506bb..22dbe5195f 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -196,7 +196,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.doctype) + meta = frappe.get_meta(args.parenttype or args.doctype) if meta.get_field("currency"): validate_price_list(args) From 0e553aa6b894508887f9d54612b0ab769308863b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 15 Feb 2016 12:23:57 +0600 Subject: [PATCH 2/2] bumped to version 6.21.6 --- 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 5440c3d140..4e3fa17665 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.21.5' +__version__ = '6.21.6' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index d42d43ea2c..aa4ae96fb5 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.21.5" +app_version = "6.21.6" 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 ab62defd9a..b91fd22991 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.21.5" +version = "6.21.6" requirements = parse_requirements("requirements.txt", session="") setup(