Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.18.0'
+__version__ = '6.18.1'

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.0"
+app_version = "6.18.1"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/stock/doctype/manufacturer/manufacturer.json

@@ -22,7 +22,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Short Name", 
-   "length": 10, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -221,4 +221,4 @@
  "sort_field": "", 
  "sort_order": "DESC", 
  "title_field": "short_name"
-}
+}

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.18.0"
+version = "6.18.1"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(