commit 7bdc45ecebf27b2dbd4a23796a8311a0a7da8bc2
author Saurabh <saurabh6790@gmail.com> Tue Jul 25 18:02:58 2017 +0530
committer Saurabh <saurabh6790@gmail.com> Tue Jul 25 18:02:58 2017 +0530
tree dd19759c9291ed647a430916b385c24fc1f4e00b
parent dc6e36917250a14a2f415c1ed17b709d4129c1ea
parent 4c28fa77bd6cc01039efd446881eb9f1c44eb751

Merge branch 'master' into develop

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 0dfe6d3..2d4f94e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.6.0'
+__version__ = '8.6.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/selling/doctype/sales_order/sales_order.json

diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 8d19083..596bf2f 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -3659,7 +3659,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-19 13:45:02.965353", 
+ "modified": "2017-07-25 13:45:02.965353", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order",