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

fix: update new changes

Browse Source
This commit is contained in:
Anuja P 2021-05-13 15:15:47 +05:30
parent 554c91d638
commit e90a2a346b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
View File

@ -79,8 +79,8 @@
</tbody> </tbody>
</table> </table>
<br> <br>
{% if aging %} {% if ageing %}
<h4 class="text-center">{{ _("Ageing Report based on ") }} {{ aging.ageing_based_on }} <h4 class="text-center">{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }}
{{ _("up to " ) }} {{ frappe.format(filters.to_date, 'Date')}} {{ _("up to " ) }} {{ frappe.format(filters.to_date, 'Date')}}
</h4> </h4>
<table class="table table-bordered"> <table class="table table-bordered">
@ -94,10 +94,10 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>{{ frappe.utils.fmt_money(aging.range1, currency=filters.presentation_currency) }}</td> <td>{{ frappe.utils.fmt_money(ageing.range1, currency=filters.presentation_currency) }}</td>
<td>{{ frappe.utils.fmt_money(aging.range2, currency=filters.presentation_currency) }}</td> <td>{{ frappe.utils.fmt_money(ageing.range2, currency=filters.presentation_currency) }}</td>
<td>{{ frappe.utils.fmt_money(aging.range3, currency=filters.presentation_currency) }}</td> <td>{{ frappe.utils.fmt_money(ageing.range3, currency=filters.presentation_currency) }}</td>
<td>{{ frappe.utils.fmt_money(aging.range4, currency=filters.presentation_currency) }}</td> <td>{{ frappe.utils.fmt_money(ageing.range4, currency=filters.presentation_currency) }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@ -94,7 +94,7 @@ def get_report_pdf(doc, consolidated=True):
continue continue
html = frappe.render_template(template_path, \ html = frappe.render_template(template_path, \
{"filters": filters, "data": res, "aging": aging[0] if doc.include_ageing else None, {"filters": filters, "data": res, "ageing": ageing[0] if doc.include_ageing else None,
"letter_head": letter_head if doc.letter_head else None, "letter_head": letter_head if doc.letter_head else None,
"terms_and_conditions": frappe.db.get_value('Terms and Conditions', doc.terms_and_conditions, 'terms') "terms_and_conditions": frappe.db.get_value('Terms and Conditions', doc.terms_and_conditions, 'terms')
if doc.terms_and_conditions else None}) if doc.terms_and_conditions else None})