Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 9b973a7..3d50b1b 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.18.1'
+__version__ = '6.18.2'
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 1725b7e..26a9fa6 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -70,7 +70,8 @@
});
if(!from_delivery_note && !is_delivered_by_supplier) {
- cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Delivery Note'], __("Make"));
+ cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'],
+ __("Make"));
}
}
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 4a70112..54c98bc 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.1"
+app_version = "6.18.2"
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 e5e0938..b3bc66b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -170,8 +170,6 @@
barcode: item.barcode,
serial_no: item.serial_no,
warehouse: item.warehouse,
- parenttype: me.frm.doc.doctype,
- parent: me.frm.doc.name,
customer: me.frm.doc.customer,
supplier: me.frm.doc.supplier,
currency: me.frm.doc.currency,
@@ -186,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: item.doctype,
- name: item.name,
+ doctype: me.frm.doctype,
+ name: me.frm.name,
project_name: item.project_name || me.frm.doc.project_name,
qty: item.qty
}
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index e201176..ea69ca0 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -167,7 +167,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-01-17 11:39:36.686949",
+ "modified": "2016-01-21 11:39:36.686949",
"modified_by": "Administrator",
"module": "Stock",
"name": "Manufacturer",
diff --git a/setup.py b/setup.py
index b8b75ba..fc6c777 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.1"
+version = "6.18.2"
requirements = parse_requirements("requirements.txt", session="")
setup(