From fd5005567b459be86a3e31c20698e0e5ea30c3fb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 6 Feb 2012 06:34:04 +0100 Subject: [PATCH 1/2] Fix in setup role permissions --- .../doctype/setup_wizard_control/setup_wizard_control.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py index 10904c3f6f..f6b04eb487 100644 --- a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py +++ b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py @@ -46,11 +46,7 @@ class DocType: #======================================================================================================= def get_page_lst(self,nm): - - r1 = cstr(webnotes.user.get_roles()).replace('[','').replace(']','') - - ret = sql("select parent from `tabPage Role` where role in (%s) and parent = '%s'"%(r1,nm)) - + ret = sql("select parent from `tabPage Role` where role in ('%s') and parent = '%s'" % ("','".join(webnotes.user.get_roles()),nm)) return ret and True or False #======================================================================================================= From 7e13f9b4b5c132936e3737cc02636a77da1ca040 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 6 Feb 2012 11:41:25 +0530 Subject: [PATCH 2/2] Fix in email digest due to unicode change --- erpnext/setup/doctype/email_digest/email_digest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index 73c3a1ee7a..93273ba7aa 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -520,7 +520,8 @@ class DocType: currency = company.default_currency def table(args): - if type(args['body']) == type(''): + table_body = "" + if isinstance(args['body'], basestring): table_body = """\