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

Obey currency filter in financial statement prints #pdd (#13648)

Browse Source
This commit is contained in:
Faris Ansari 2018-04-14 11:04:00 +05:30 committed by Rushabh Mehta
parent a952e40b56
commit ed34a442a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/financial_statements.html
View File

@ -22,9 +22,9 @@
<h2 class="text-center">{%= __(report.report_name) %}</h2> <h2 class="text-center">{%= __(report.report_name) %}</h2>
<h3 class="text-center">{%= filters.company %}</h3> <h3 class="text-center">{%= filters.company %}</h3>
<h3 class="text-center">{%= filters.fiscal_year %}</h3> <h3 class="text-center">{%= filters.fiscal_year %}</h3>
<h5 class="text-center">{%= __("Currency") %} : {%= erpnext.get_currency(filters.company) %} </h4> <h5 class="text-center">{%= __("Currency") %} : {%= filters.presentation_currency || erpnext.get_currency(filters.company) %} </h4>
{% if (filters.from_date) { %} {% if (filters.from_date) { %}
<h4 class="text-center">{%= dateutil.str_to_user(filters.from_date) %} - {%= dateutil.str_to_user(filters.to_date) %}</h3> <h4 class="text-center">{%= frappe.datetime.str_to_user(filters.from_date) %} - {%= frappe.datetime.str_to_user(filters.to_date) %}</h3>
{% } %} {% } %}
<hr> <hr>
<table class="table table-bordered"> <table class="table table-bordered">
@ -51,7 +51,7 @@
<td class="text-right"> <td class="text-right">
{% var fieldname = report.columns[i].field || report.columns[i].fieldname; %} {% var fieldname = report.columns[i].field || report.columns[i].fieldname; %}
{% if (!is_null(row[fieldname])) { %} {% if (!is_null(row[fieldname])) { %}
{%= format_number(row[fieldname], null)%} {%= format_currency(row[fieldname], filters.presentation_currency) %}
{% } %} {% } %}
</td> </td>
{% } %} {% } %}
@ -59,4 +59,4 @@
{% } %} {% } %}
</tbody> </tbody>
</table> </table>
<p class="text-right text-muted">Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p> <p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

6
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@ -19,7 +19,7 @@ def execute(filters=None):
accumulated_values=filters.accumulated_values, accumulated_values=filters.accumulated_values,
ignore_closing_entries=True, ignore_accumulated_values_for_fy= True) ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company) net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company, filters.presentation_currency)
data = [] data = []
data.extend(income or []) data.extend(income or [])
@ -33,13 +33,13 @@ def execute(filters=None):
return columns, data, None, chart return columns, data, None, chart
def get_net_profit_loss(income, expense, period_list, company): def get_net_profit_loss(income, expense, period_list, company, currency=None):
total = 0 total = 0
net_profit_loss = { net_profit_loss = {
"account_name": "'" + _("Profit for the year") + "'", "account_name": "'" + _("Profit for the year") + "'",
"account": "'" + _("Profit for the year") + "'", "account": "'" + _("Profit for the year") + "'",
"warn_if_negative": True, "warn_if_negative": True,
"currency": frappe.db.get_value("Company", company, "default_currency") "currency": currency or frappe.db.get_value("Company", company, "default_currency")
} }
has_value = False has_value = False