commit c51ef85dd855713b1fe4037d7f1b2828b9d406ff
author Nabin Hait <nabinhait@gmail.com> Thu Jan 21 17:10:15 2016 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Jan 21 17:10:15 2016 +0530
tree 9457f5f35d0fd724113f53a52910bad1d9c31d52
parent ccddc48cedfc925222fde36775866796aeda8ddd
parent 3fc4e7c53f7f3ba5f30c15134de1da93ce2209e6

Merge branch 'develop'

erpnext/__version__.py

diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 8f56bbf..9b973a7 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.18.0'
+__version__ = '6.18.1'

erpnext/hooks.py

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a1c369e..4a70112 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.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

diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index 623e352..e201176 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/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"
-}
\ No newline at end of file
+}

setup.py

diff --git a/setup.py b/setup.py
index 9246a01..b8b75ba 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.0"
+version = "6.18.1"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(