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

Merge branch 'develop'

Browse Source
This commit is contained in:
mbauskar 2017-06-29 21:58:08 +05:30
commit 4e08dfc72f
2 changed files with 2 additions and 2 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 from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.2.0' __version__ = '8.2.1'
def get_default_company(user=None): def get_default_company(user=None):

2
erpnext/patches/v8_1/delete_deprecated_reports.py
View File

@ -35,7 +35,7 @@ def check_and_update_desktop_icon_for_report(report):
elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]: elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]:
frappe.db.sql("""update `tabDesktop Icon` set _report='{value}' frappe.db.sql("""update `tabDesktop Icon` set _report='{value}'
where name in ({docnames})""".format( where name in ({docnames})""".format(
value=report, value="Addresses And Contacts",
docnames=",".join(["'%s'"%icon for icon in desktop_icons]) docnames=",".join(["'%s'"%icon for icon in desktop_icons])
) )
) )