nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

error fixed in trash control

Browse Source
This commit is contained in:
Nabin Hait
2012-02-13 18:24:14 +05:30
parent e63ea67b54
commit 409612457b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/utilities/doctype/trash_control/trash_control.py
View File

@@ -26,7 +26,7 @@ class DocType:
# ----------- # -----------
def get_masters(self): def get_masters(self):
mlist = [] mlist = []
res = sql("select distinct t1.name from tabDocType t1, tabDocPerm t2 where ifnull(t1.allow_trash, 0) = 1 and (ifnull(t2.write, 0) = 1 or ifnull(t2.create, 0) = 1) and t2.role in %s and t2.parent = t1.name and t1.module not in ('DocType','Application Internal','Recycle Bin','Development','Testing','Testing System','Test') ORDER BY t1.name" % cstr(tuple(webnotes.user.get_roles()))) res = sql("select distinct t1.name from tabDocType t1, tabDocPerm t2 where ifnull(t1.allow_trash, 0) = 1 and (ifnull(t2.write, 0) = 1 or ifnull(t2.create, 0) = 1) and t2.role in (%s) and t2.parent = t1.name and t1.module not in ('DocType','Application Internal','Recycle Bin','Development','Testing','Testing System','Test') ORDER BY t1.name" % ("'"+"', '".join(webnotes.user.get_roles())+"'"))
for r in res: for r in res:
mlist.append(r[0]) mlist.append(r[0])
return mlist return mlist
@@ -56,4 +56,4 @@ class DocType:
for r in arg[k]: for r in arg[k]:
sql("update `tab%s` set docstatus = 0, modified = '%s', trash_reason = '' where name = '%s'" % (k, now(), r)) sql("update `tab%s` set docstatus = 0, modified = '%s', trash_reason = '' where name = '%s'" % (k, now(), r))
dt_obj = get_obj(k,r) dt_obj = get_obj(k,r)
if hasattr(dt_obj, 'on_restore'): dt_obj.on_restore() if hasattr(dt_obj, 'on_restore'): dt_obj.on_restore()