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

Merge branch 'master' of github.com:webnotes/erpnext into 1209

Browse Source
This commit is contained in:
Anand Doshi 2012-09-26 12:44:44 +05:30
commit 47ee285ff9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@ class DocType:
def get_html(self, label, currency, value, style=None): def get_html(self, label, currency, value, style=None):
"""get html output""" """get html output"""
return """<p style="padding: 5px; %(style)s"> return """<p style="%(style)s">
<span>%(label)s</span>: <span>%(label)s</span>:
<span style="font-weight: bold; font-size: 110%%"> <span style="font-weight: bold; font-size: 110%%">
<span style="color: grey">%(currency)s</span>%(value)s <span style="color: grey">%(currency)s</span>%(value)s
@ -293,7 +293,8 @@ class DocType:
if not hasattr(self, "accounts"): if not hasattr(self, "accounts"):
self.accounts = webnotes.conn.sql("""select name, is_pl_account, self.accounts = webnotes.conn.sql("""select name, is_pl_account,
debit_or_credit, account_type, account_name, master_type debit_or_credit, account_type, account_name, master_type
from `tabAccount` where company=%s and docstatus < 2""", from `tabAccount` where company=%s and docstatus < 2
order by lft""",
(self.doc.company,), as_dict=1) (self.doc.company,), as_dict=1)
return self.accounts return self.accounts