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

fix: Financial statement report

Browse Source 
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
This commit is contained in:
Suraj Shetty 2019-12-12 13:06:17 +05:30
parent b3af2adc4a
commit f95267041d
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{% {%
var report_columns = report.get_columns_for_print(); var report_columns = report.get_columns_for_print();
report_columns = report_columns.filter(col => !col.hidden);
if (report_columns.length > 8) { if (report_columns.length > 8) {
frappe.throw(__("Too many columns. Export the report and print it using a spreadsheet application.")); frappe.throw(__("Too many columns. Export the report and print it using a spreadsheet application."));
@ -15,34 +16,35 @@
height: 37px; height: 37px;
} }
</style> </style>
{% var letterhead= filters.letter_head || (frappe.get_doc(":Company", filters.company) && frappe.get_doc(":Company", filters.company).default_letter_head) %}
{% if(letterhead) { %}
<div style="margin-bottom: 7px;" class="text-center">
{%= frappe.boot.letter_heads[letterhead].header %}
</div>
{% } %}
<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>
{% if 'cost_center' in filters %} {% if 'cost_center' in filters %}
<h3 class="text-center">{%= filters.cost_center %}</h3> <h3 class="text-center">{%= filters.cost_center %}</h3>
{% endif %} {% endif %}
<h3 class="text-center">{%= filters.fiscal_year %}</h3> <h3 class="text-center">{%= filters.fiscal_year %}</h3>
<h5 class="text-center">{%= __("Currency") %} : {%= filters.presentation_currency || erpnext.get_currency(filters.company) %} </h4> <h5 class="text-center">
{%= __("Currency") %} : {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
</h5>
{% if (filters.from_date) { %} {% if (filters.from_date) { %}
<h4 class="text-center">{%= frappe.datetime.str_to_user(filters.from_date) %} - {%= frappe.datetime.str_to_user(filters.to_date) %}</h3> <h5 class="text-center">
{%= frappe.datetime.str_to_user(filters.from_date) %} - {%= frappe.datetime.str_to_user(filters.to_date) %}
</h5>
{% } %} {% } %}
<hr> <hr>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th style="width: {%= 100 - (report_columns.length - 2) * 13 %}%"></th> <th style="width: {%= 100 - (report_columns.length - 1) * 13 %}%"></th>
{% for(var i=2, l=report_columns.length; i<l; i++) { %} {% for (let i=1, l=report_columns.length; i<l; i++) { %}
<th class="text-right">{%= report_columns[i].label %}</th> <th class="text-right">{%= report_columns[i].label %}</th>
{% } %} {% } %}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for(var j=0, k=data.length-1; j<k; j++) { %} {% for(let j=0, k=data.length-1; j<k; j++) { %}
{% {%
var row = data[j]; var row = data[j];
var row_class = data[j].parent_account ? "" : "financial-statements-important"; var row_class = data[j].parent_account ? "" : "financial-statements-important";
@ -52,11 +54,11 @@
<td> <td>
<span style="padding-left: {%= cint(data[j].indent) * 2 %}em">{%= row.account_name %}</span> <span style="padding-left: {%= cint(data[j].indent) * 2 %}em">{%= row.account_name %}</span>
</td> </td>
{% for(var i=2, l=report_columns.length; i<l; i++) { %} {% for(let i=1, l=report_columns.length; i<l; i++) { %}
<td class="text-right"> <td class="text-right">
{% var fieldname = report_columns[i].fieldname; %} {% const fieldname = report_columns[i].fieldname; %}
{% if (!is_null(row[fieldname])) { %} {% if (!is_null(row[fieldname])) { %}
{%= format_currency(row[fieldname], filters.presentation_currency) %} {%= frappe.format(row[fieldname], report_columns[i], {}, row) %}
{% } %} {% } %}
</td> </td>
{% } %} {% } %}
@ -64,4 +66,6 @@
{% } %} {% } %}
</tbody> </tbody>
</table> </table>
<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.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>

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

@ -264,8 +264,8 @@ def filter_out_zero_value_rows(data, parent_children_map, show_zero_values=False
def add_total_row(out, root_type, balance_must_be, period_list, company_currency): def add_total_row(out, root_type, balance_must_be, period_list, company_currency):
total_row = { total_row = {
"account_name": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'", "account_name": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)),
"account": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'", "account": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)),
"currency": company_currency "currency": company_currency
} }