Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 3d50b1b..0e9fff9 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 54c98bc..f886b6f 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
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/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index b3bc66b..b8d9f04 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -184,8 +184,8 @@
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
}
diff --git a/setup.py b/setup.py
index fc6c777..4598671 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(