Merge branch 'stable' of github.com:webnotes/erpnext into latest
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 73c3a1e..93273ba 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -520,7 +520,8 @@
currency = company.default_currency
def table(args):
- if type(args['body']) == type(''):
+ table_body = ""
+ if isinstance(args['body'], basestring):
table_body = """\
<tbody><tr>
<td style='padding: 5px; font-size: 24px; \
@@ -530,7 +531,7 @@
</td>
</tr></tbody>"""
- elif type(args['body'] == type([])):
+ elif isinstance(args['body'], list):
body_rows = []
for rows in args['body']:
for r in rows:
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 10904c3..f6b04eb 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 @@
#=======================================================================================================
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
#=======================================================================================================