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

Merge pull request #15917 from nabinhait/encoding-issue

Browse Source 
fix(encoding): Fixed encoding issue in financial statements
This commit is contained in:
rohitwaghchaure 2018-11-06 15:37:23 +05:30 committed by GitHub
commit b5ba867b3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/financial_statements.py
View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import re import re
from past.builtins import cmp from past.builtins import cmp
@ -342,7 +344,7 @@ def set_gl_entries_by_account(
accounts = frappe.db.sql_list("""select name from `tabAccount` accounts = frappe.db.sql_list("""select name from `tabAccount`
where lft >= %s and rgt <= %s""", (root_lft, root_rgt)) where lft >= %s and rgt <= %s""", (root_lft, root_rgt))
additional_conditions += " and account in ('{}')"\ additional_conditions += " and account in ('{}')"\
.format("', '".join([frappe.safe_encode(frappe.db.escape(d)) for d in accounts])) .format("', '".join([frappe.db.escape(d) for d in accounts]))
gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year, debit_in_account_currency, credit_in_account_currency, account_currency from `tabGL Entry` gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year, debit_in_account_currency, credit_in_account_currency, account_currency from `tabGL Entry`
where company=%(company)s where company=%(company)s
@ -400,7 +402,6 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
def get_cost_centers_with_children(cost_centers): def get_cost_centers_with_children(cost_centers):
if not isinstance(cost_centers, list): if not isinstance(cost_centers, list):
cost_centers = frappe.safe_encode(cost_centers)
cost_centers = [d.strip() for d in cost_centers.strip().split(',') if d] cost_centers = [d.strip() for d in cost_centers.strip().split(',') if d]
all_cost_centers = [] all_cost_centers = []