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

fixed utf8 error in multi ledger export

Browse Source
This commit is contained in:
Nabin Hait 2012-06-11 17:48:40 +05:30
parent 031d51b53e
commit 8afa88b906
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/multi_ledger_report/multi_ledger_report.py
View File

@ -74,7 +74,7 @@ class DocType:
AND node.lft BETWEEN sub_parent.lft AND sub_parent.rgt AND node.lft BETWEEN sub_parent.lft AND sub_parent.rgt
AND sub_parent.name = sub_tree.name AND sub_parent.name = sub_tree.name
GROUP BY node.name GROUP BY node.name
ORDER BY node.lft""", acc, as_dict = 1) ORDER BY node.lft""", acc, as_dict = 1, as_utf8=1)
@ -110,7 +110,7 @@ class DocType:
def show_gl_entries(self, acc): def show_gl_entries(self, acc):
"""Get gl entries for the period and account""" """Get gl entries for the period and account"""
gle = sql("select posting_date, voucher_type, voucher_no, debit, credit, remarks from `tabGL Entry` WHERE account = %s and posting_date >= %s AND posting_date <= %s and ifnull(is_opening, 'No') = 'No' and ifnull(is_cancelled, 'No') = 'No'", (acc, self.doc.from_date, self.doc.to_date), as_dict=1) gle = sql("select posting_date, voucher_type, voucher_no, debit, credit, remarks from `tabGL Entry` WHERE account = %s and posting_date >= %s AND posting_date <= %s and ifnull(is_opening, 'No') = 'No' and ifnull(is_cancelled, 'No') = 'No'", (acc, self.doc.from_date, self.doc.to_date), as_dict=1, as_utf8=1)
entries, dr, cr = [], 0, 0 entries, dr, cr = [], 0, 0
for d in gle: for d in gle:
entries.append(['', d['posting_date'], d['voucher_type'], d['voucher_no'], d['debit'], d['credit'], d['remarks']]) entries.append(['', d['posting_date'], d['voucher_type'], d['voucher_no'], d['debit'], d['credit'], d['remarks']])