commit b628971a80f981ef8962235843763abe3c67a2af
author Nabin Hait <nabinhait@gmail.com> Thu Dec 15 16:35:32 2016 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Dec 15 16:35:32 2016 +0530
tree beba704e2aeaf7a39648a002d7a76935c232dd69
parent 7ac0d294e1ad9ea79061d068f74b2405005a9836
parent 8a321406b21a171a37b544cc647c1e582467ca31

Merge branch 'hotfix'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 6c93525..debf4bf 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.1.25'
+__version__ = '7.1.26'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/tax_rule/tax_rule.json

diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index 3e84be5..704393a 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -764,7 +764,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-03 15:56:28.704122", 
+ "modified": "2016-12-13 15:56:28.704122", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -793,10 +793,10 @@
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_seen": 0
-}
\ No newline at end of file
+}