Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-12-15 16:35:58 +05:30
commit 6eda07e445
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -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'''

4
erpnext/accounts/doctype/tax_rule/tax_rule.json
View File

@ -791,7 +791,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-11-07 05:17:58.691011",
"modified": "2016-12-13 15:56:28.704122",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Tax Rule",
@ -820,7 +820,7 @@
"write": 1
}
],
"quick_entry": 1,
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",