From afe85bdd04578b29632a115918a731db344bb9d9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Jan 2016 21:04:16 +0530 Subject: [PATCH 1/2] [hotfix] use me.frm.doc in get_item_details --- erpnext/public/js/controllers/transaction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index b3bc66b165..b8d9f04915 100644 --- 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 } From dd74b5d44fe9ded54264800a8929217f1006f77b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Jan 2016 21:36:34 +0600 Subject: [PATCH 2/2] bumped to version 6.18.3 --- 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 3d50b1b40a..0e9fff975b 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.18.2' +__version__ = '6.18.3' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 54c98bced9..f886b6f0c0 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.18.2" +app_version = "6.18.3" 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 fc6c777978..45986713f9 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.18.2" +version = "6.18.3" requirements = parse_requirements("requirements.txt", session="") setup(