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

Merge branch 'stable' of github.com:webnotes/erpnext into latest

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-06 07:12:43 +01:00
commit 04048ff890
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -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 = """\
<tbody><tr>
<td style='padding: 5px; font-size: 24px; \
@ -530,7 +531,7 @@ class DocType:
</td>
</tr></tbody>"""
elif type(args['body'] == type([])):
elif isinstance(args['body'], list):
body_rows = []
for rows in args['body']:
for r in rows:

6
erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py
View File

@ -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
#=======================================================================================================